Merge branch 'master' of https://github.com/justbur/emacs-which-key
authorjustbur <justin@burkett.cc>
Thu, 16 Jul 2015 11:53:34 +0000 (07:53 -0400)
committerjustbur <justin@burkett.cc>
Thu, 16 Jul 2015 11:53:34 +0000 (07:53 -0400)
1  2 
which-key.el

diff --cc which-key.el
Simple merge